Make Xen headers lint-clean, and fix xs_wire.h for Solaris compiler.

Signed-off-by: John Levon <john.levon@sun.com>
Signed-off-by: Ryan Scott <ryan.scott@sun.com>

diff --git a/xen/include/public/io/ring.h b/xen/include/public/io/ring.h
index 704460b599ebaa6de2b4f7c80ec3ac0ff8f887f1..355eba55452935785534cc3b1bfc7be1dbead478 100644 (file)
--- a/xen/include/public/io/ring.h
+++ b/xen/include/public/io/ring.h
@@ -133,7 +133,7 @@ typedef struct __name##_back_ring __name##_back_ring_t
 #define SHARED_RING_INIT(_s) do {                                       \
     (_s)->req_prod  = (_s)->rsp_prod  = 0;                              \
     (_s)->req_event = (_s)->rsp_event = 1;                              \
-    memset((_s)->pad, 0, sizeof((_s)->pad));                            \
+    (void)memset((_s)->pad, 0, sizeof((_s)->pad));                      \
 } while(0)
 
 #define FRONT_RING_INIT(_r, _s, __size) do {                            \

diff --git a/xen/include/public/io/xs_wire.h b/xen/include/public/io/xs_wire.h
index 009a53be4b292e72c3b6136bae5cc4853bb63883..927ed8c944e8809903d6015b3485091a2d513b6b 100644 (file)
--- a/xen/include/public/io/xs_wire.h
+++ b/xen/include/public/io/xs_wire.h
@@ -60,7 +60,11 @@ struct xsd_errors
     const char *errstring;
 };
 #define XSD_ERROR(x) { x, #x }
-static struct xsd_errors xsd_errors[] __attribute__((unused)) = {
+static struct xsd_errors xsd_errors[]
+#if defined(__GNUC__)
+__attribute__((unused))
+#endif
+    = {
     XSD_ERROR(EINVAL),
     XSD_ERROR(EACCES),
     XSD_ERROR(EEXIST),